From: Colin Walters <walters@verbum.org>
Date: Fri, 23 Jun 2017 20:26:44 +0000 (-0400)
Subject: tests: add a syntax-check rule for glnx_prefix_error()
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~35^2~65
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=da0791f484ff6c06eed1d7ba83bddbc931cfdd2d;p=ostree.git

tests: add a syntax-check rule for glnx_prefix_error()

Same as the errno variant; the colon-space `: ` thing got me in a different
patch.

Closes: #956
Approved by: jlebon
---

diff --git a/cfg.mk b/cfg.mk
index b4ffaf5f..f6f1ce25 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,6 +23,10 @@ local-checks-to-skip = \
     sc_prohibit_path_max_allocation \
     sc_trailing_blank \
 
+sc_glnx_prefix_error_colon:
+	@prohibit='\<glnx_prefix_error *\(.*: ",' halt="don't add trailing : for glnx_prefix_error"	\
+	  $(_sc_search_regexp)
+
 sc_glnx_errno_prefix_colon:
 	@prohibit='\<glnx_throw_errno_prefix *\(.*: ",' halt="don't add trailing : for glnx_throw_errno_prefix"	\
 	  $(_sc_search_regexp)
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 45b5bc6e..cf6d90e7 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -762,7 +762,7 @@ write_content_object (OstreeRepo         *self,
                                     uid, gid, mode,
                                     xattrs, temp_fd,
                                     cancellable, error))
-    return glnx_prefix_error (error, "Writing object %s.%s: ", actual_checksum,
+    return glnx_prefix_error (error, "Writing object %s.%s", actual_checksum,
                               ostree_object_type_to_string (OSTREE_OBJECT_TYPE_FILE));
   /* Clear the unlinker path, it was consumed */
   tmp_unlinker.path = NULL;